22b858ec163c9fbbcdd4afbfc64213f8b725687e,src/main/java/org/datanucleus/store/hbase/query/HBaseQueryUtils.java,HBaseQueryUtils,getObjectUsingDatastoreIdForResult,#Result#AbstractClassMetaData#ExecutionContext#boolean#number[]#String#StoreManager#Table#,322

Before Change


            String familyName = HBaseUtils.getFamilyNameForColumn(table.getDiscriminatorColumn());
            String columnName = HBaseUtils.getQualifierNameForColumn(table.getDiscriminatorColumn());
            Object discValue = new String(result.getValue(familyName.getBytes(), columnName.getBytes()));
            if (cmd.getDiscriminatorStrategy() == DiscriminatorStrategy.CLASS_NAME && !cmd.getFullClassName().equals(discValue))
            {
                return null;
            }
            else if (cmd.getDiscriminatorStrategy() == DiscriminatorStrategy.ENTITY_NAME && !cmd.getEntityName().equals(discValue))
            {
                return null;
            }
            else if (cmd.getDiscriminatorStrategy() == DiscriminatorStrategy.VALUE_MAP && !cmd.getDiscriminatorValue().equals(discValue))
            {
                return null;
            }

After Change


            String familyName = HBaseUtils.getFamilyNameForColumn(table.getDiscriminatorColumn());
            String columnName = HBaseUtils.getQualifierNameForColumn(table.getDiscriminatorColumn());
            Object discValue = new String(result.getValue(familyName.getBytes(), columnName.getBytes()));
            Object cmdDiscValue = cmd.getDiscriminatorValue();
            if (cmd.getDiscriminatorStrategy() != DiscriminatorStrategy.NONE && !cmdDiscValue.equals(discValue))
            {
                return null;